Auto merge of #2159 - Manishearth:native-diag, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 20 Nov 2015 18:29:44 +0000 (18:29 +0000)
committerbors <bors@rust-lang.org>
Fri, 20 Nov 2015 18:29:44 +0000 (18:29 +0000)
r? @alexcrichton


Trivial merge